Skip to content
This repository has been archived by the owner on Jan 3, 2018. It is now read-only.

Template for IPython Notebook #252

Merged
merged 3 commits into from
Feb 10, 2014
Merged

Conversation

rgaiacs
Copy link

@rgaiacs rgaiacs commented Jan 25, 2014

Add template to IPython Notebook so when build the lessons it will have the same look of SWC site. In the figure below you see how it look when using the "new" template.

new

And for comparison, the same lesson in IPython Notebook and with the "old" template.

notebook

old

With this template we lost highlight but we will have the diff tool based on Polyphemus that @scopatz is working on in site/321.

Raniere Silva added 2 commits January 24, 2014 21:33
Template for ipynb to make lessons have the same style of others
markdown lessons and necessary changes in Makefile since now
ipynb -> md -> html.

This come from @gvwilson.

Related to issues:

- [site/119](swcarpentry/DEPRECATED-site#119)
- [site/321](swcarpentry/DEPRECATED-site#321)
- [bc/179](swcarpentry#179)
- Add input mark
- Add output mark

BUG:

- `output.text` in `stream` block end with new line character
@ethanwhite
Copy link
Contributor

Looks awesome!

@rgaiacs
Copy link
Author

rgaiacs commented Jan 25, 2014

Just discover a small problem with the images, it's write the path to it instead to render it. Working on that.

- Escape all text input and output. This is require to avoid
  troubles with `<`, `>` and other characters that have special
  meaning in HTML
- Replace markdown syntax for images output with HTML
@gvwilson
Copy link
Contributor

Does this now include the image path fix? If so, I'll merge it.

@rgaiacs
Copy link
Author

rgaiacs commented Jan 27, 2014

@gvwilson Yes.

@ahmadia
Copy link
Contributor

ahmadia commented Jan 27, 2014

There's some changes in the Makefile that I don't completely understand (and don't have the time to review right now). Otherwise, this looks good to me.

@rgaiacs
Copy link
Author

rgaiacs commented Jan 27, 2014

@ahmadia Yes, there are some changes in the Makefile. They came from @gvwilson.

@ahmadia
Copy link
Contributor

ahmadia commented Feb 1, 2014

@r-gaia-cs - These are beautiful! I just checked a local notebook out and the images are rendering fine. I'm +5 for merge ;) ⭐

@ahmadia
Copy link
Contributor

ahmadia commented Feb 1, 2014

@gvwilson - fixes for image paths are in rgaiacs@5659c1b I believe.

gvwilson pushed a commit that referenced this pull request Feb 10, 2014
Template for IPython Notebook
@gvwilson gvwilson merged commit c241573 into swcarpentry:master Feb 10, 2014
rgaiacs pushed a commit to rgaiacs/bc that referenced this pull request Feb 13, 2014
Related to issue swcarpentry#289.

Fix problem when PR swcarpentry#252 was merged.
@rgaiacs rgaiacs deleted the ipynb-template branch February 17, 2014 01:54
@rgaiacs
Copy link
Author

rgaiacs commented Feb 17, 2014

Update: @gvwilson find the "In[ ]" and "Out[ ]" markers distracting and get rid of it.

rgaiacs pushed a commit to rgaiacs/bc that referenced this pull request Feb 17, 2014
Related to issue swcarpentry#289.

Fix problem when PR swcarpentry#252 was merged.
rgaiacs pushed a commit to rgaiacs/bc that referenced this pull request Feb 18, 2014
Related to issue swcarpentry#289.

Fix problem when PR swcarpentry#252 was merged.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants